Wayland: Fix various compiler warnings

Mostly missing declarations, missing statics and unused functions.

diff --git a/gdk/wayland/gdkapplaunchcontext-wayland.c b/gdk/wayland/gdkapplaunchcontext-wayland.c
index 328e04d116f21032d91eef0e91030942f6120a6c..6991164e0b78d5cb747cc9ac5679be09b801f21c 100644 (file)
--- a/gdk/wayland/gdkapplaunchcontext-wayland.c
+++ b/gdk/wayland/gdkapplaunchcontext-wayland.c
@@ -59,6 +59,8 @@ struct _GdkWaylandAppLaunchContextClass
   GdkAppLaunchContextClass base_class;
 };
 
+GType gdk_wayland_app_launch_context_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandAppLaunchContext, gdk_wayland_app_launch_context, GDK_TYPE_APP_LAUNCH_CONTEXT)
 
 static void

diff --git a/gdk/wayland/gdkcursor-wayland.c b/gdk/wayland/gdkcursor-wayland.c
index b247fad6b3f1dce5f595a9a824d5aba00304f8f9..38a8dbb2d7e82f29df09e3e704337d96c2d13bd5 100644 (file)
--- a/gdk/wayland/gdkcursor-wayland.c
+++ b/gdk/wayland/gdkcursor-wayland.c
@@ -66,6 +66,8 @@ struct _GdkWaylandCursorClass
   GdkCursorClass cursor_class;
 };
 
+GType _gdk_wayland_cursor_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandCursor, _gdk_wayland_cursor, GDK_TYPE_CURSOR)
 
 void

diff --git a/gdk/wayland/gdkdevice-wayland.c b/gdk/wayland/gdkdevice-wayland.c
index 8222ee13931531be944580f9f5d3ed6fc88db3e4..bc52fb127bb3378170a21a6930edf075fd888327 100644 (file)
--- a/gdk/wayland/gdkdevice-wayland.c
+++ b/gdk/wayland/gdkdevice-wayland.c
@@ -132,6 +132,8 @@ struct _GdkWaylandDeviceManagerClass
   GdkDeviceManagerClass parent_class;
 };
 
+GType gdk_wayland_device_manager_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandDeviceManager,
               gdk_wayland_device_manager, GDK_TYPE_DEVICE_MANAGER)
 

diff --git a/gdk/wayland/gdkdisplay-wayland.c b/gdk/wayland/gdkdisplay-wayland.c
index 20d63bb687784dcb3635597884c1eeb9452df942..dc344b463eac1c5e43323f39620ec3c69b225ff9 100644 (file)
--- a/gdk/wayland/gdkdisplay-wayland.c
+++ b/gdk/wayland/gdkdisplay-wayland.c
@@ -418,73 +418,10 @@ gdk_wayland_display_get_next_serial (GdkDisplay *display)
   return ++serial;
 }
 
-/**
- * gdk_wayland_display_broadcast_startup_message:
- * @display: a #GdkDisplay
- * @message_type: startup notification message type ("new", "change",
- * or "remove")
- * @...: a list of key/value pairs (as strings), terminated by a
- * %NULL key. (A %NULL value for a key will cause that key to be
- * skipped in the output.)
- *
- * Sends a startup notification message of type @message_type to
- * @display. 
- *
- * This is a convenience function for use by code that implements the
- * freedesktop startup notification specification. Applications should
- * not normally need to call it directly. See the 
- * [Startup Notification Protocol specification](http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt)
- * for definitions of the message types and keys that can be used.
- *
- * Since: 2.12
- **/
-void
-gdk_wayland_display_broadcast_startup_message (GdkDisplay *display,
-                                              const char *message_type,
-                                              ...)
-{
-  GString *message;
-  va_list ap;
-  const char *key, *value, *p;
-
-  message = g_string_new (message_type);
-  g_string_append_c (message, ':');
-
-  va_start (ap, message_type);
-  while ((key = va_arg (ap, const char *)))
-    {
-      value = va_arg (ap, const char *);
-      if (!value)
-       continue;
-
-      g_string_append_printf (message, " %s=\"", key);
-      for (p = value; *p; p++)
-       {
-         switch (*p)
-           {
-           case ' ':
-           case '"':
-           case '\\':
-             g_string_append_c (message, '\\');
-             break;
-           }
-
-         g_string_append_c (message, *p);
-       }
-      g_string_append_c (message, '\"');
-    }
-  va_end (ap);
-
-  g_string_free (message, TRUE);
-}
-
 static void
 gdk_wayland_display_notify_startup_complete (GdkDisplay  *display,
                                             const gchar *startup_id)
 {
-  gdk_wayland_display_broadcast_startup_message (display, "remove",
-                                                "ID", startup_id,
-                                                NULL);
 }
 
 static void
@@ -500,7 +437,7 @@ gdk_wayland_display_event_data_free (GdkDisplay *display,
 {
 }
 
-GdkKeymap *
+static GdkKeymap *
 _gdk_wayland_display_get_keymap (GdkDisplay *display)
 {
   GdkDeviceManager *device_manager;
@@ -764,7 +701,7 @@ static const struct wl_buffer_listener buffer_listener = {
   buffer_release_callback
 };
 
-struct wl_shm_pool *
+static struct wl_shm_pool *
 create_shm_pool (struct wl_shm  *shm,
                  int             width,
                  int             height,

diff --git a/gdk/wayland/gdkdnd-wayland.c b/gdk/wayland/gdkdnd-wayland.c
index e68569ad15719aea8c1d3da30e0898ee80976dbb..e04e1ce24a6ff92bd6806698a0b11e93e81789bb 100644 (file)
--- a/gdk/wayland/gdkdnd-wayland.c
+++ b/gdk/wayland/gdkdnd-wayland.c
@@ -56,6 +56,8 @@ struct _GdkWaylandDragContextClass
 
 static GList *contexts;
 
+GType gdk_wayland_drag_context_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandDragContext, gdk_wayland_drag_context, GDK_TYPE_DRAG_CONTEXT)
 
 static void

diff --git a/gdk/wayland/gdkkeys-wayland.c b/gdk/wayland/gdkkeys-wayland.c
index d7341446c4df7ccac925e1c4ef734b3bd5259242..bdd0d5429c86ef663d2c180268d7e8e4f5400639 100644 (file)
--- a/gdk/wayland/gdkkeys-wayland.c
+++ b/gdk/wayland/gdkkeys-wayland.c
@@ -64,6 +64,8 @@ struct _GdkWaylandKeymapClass
 #define GDK_WAYLAND_KEYMAP(object)       (G_TYPE_CHECK_INSTANCE_CAST ((object), GDK_TYPE_WAYLAND_KEYMAP, GdkWaylandKeymap))
 #define GDK_IS_WAYLAND_KEYMAP(object)    (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDK_TYPE_WAYLAND_KEYMAP))
 
+GType _gdk_wayland_keymap_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandKeymap, _gdk_wayland_keymap, GDK_TYPE_KEYMAP)
 
 static void

diff --git a/gdk/wayland/gdkscreen-wayland.c b/gdk/wayland/gdkscreen-wayland.c
index baa1bc888c7db171f1be0ce651077557d14044fe..4a77ba063a435eb5208c3661f86480d666b0de0d 100644 (file)
--- a/gdk/wayland/gdkscreen-wayland.c
+++ b/gdk/wayland/gdkscreen-wayland.c
@@ -98,6 +98,8 @@ struct _GdkWaylandMonitor
   gint          scale;
 };
 
+GType _gdk_wayland_screen_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandScreen, _gdk_wayland_screen, GDK_TYPE_SCREEN)
 
 static void
@@ -805,6 +807,8 @@ struct _GdkWaylandVisualClass
   GdkVisualClass parent_class;
 };
 
+GType _gdk_wayland_visual_get_type (void);
+
 G_DEFINE_TYPE (GdkWaylandVisual, _gdk_wayland_visual, GDK_TYPE_VISUAL)
 
 static void

diff --git a/gdk/wayland/gdkselection-wayland.c b/gdk/wayland/gdkselection-wayland.c
index 965bb2ce22326e1d26c7fd033143f3e552e7a0ee..98c693068bfffd90db2ad6b38f4cc609e29ccd93 100644 (file)
--- a/gdk/wayland/gdkselection-wayland.c
+++ b/gdk/wayland/gdkselection-wayland.c
@@ -346,7 +346,7 @@ gdk_wayland_selection_get_targets (void)
   return selection->targets;
 }
 
-void
+static void
 gdk_wayland_selection_emit_request (GdkWindow *window,
                                     GdkAtom    selection,
                                     GdkAtom    target)
@@ -366,7 +366,7 @@ gdk_wayland_selection_emit_request (GdkWindow *window,
   gdk_event_free (event);
 }
 
-gboolean
+static gboolean
 gdk_wayland_selection_check_write (GdkWaylandSelection *selection)
 {
   gssize len, bytes_written = 0;

diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
index 2dcc552257b0c69e2e343373b08410725cab4f13..31f31168b7cca61eb1cc62b1a9dc6a52f77a8cf9 100644 (file)
--- a/gdk/wayland/gdkwindow-wayland.c
+++ b/gdk/wayland/gdkwindow-wayland.c
@@ -135,6 +135,8 @@ static void gdk_wayland_window_configure (GdkWindow *window,
                                           int        width,
                                           int        height);
 
+GType _gdk_window_impl_wayland_get_type (void);
+
 G_DEFINE_TYPE (GdkWindowImplWayland, _gdk_window_impl_wayland, GDK_TYPE_WINDOW_IMPL)
 
 static void
@@ -1484,7 +1486,7 @@ gdk_wayland_window_get_type_hint (GdkWindow *window)
   return impl->hint;
 }
 
-void
+static void
 gdk_wayland_window_set_modal_hint (GdkWindow *window,
                                    gboolean   modal)
 {